Updates to analysis mostly