Small improvements
small cleanup
Advanced the implementation of the engine a bit
...