Improved, engine, several fixes