Minor engine optimizations
Misc
More misc fixing