Condensation and bug fixes