major progress on fixing the engine