Cleanup
Save some engine settings in project file
Restore some engine settings from projects; Misc fixing