fixed phasing issues and general cleanup