Change some stuff in the engine

and a bunch of other stuff..