Engine Update

Bugfixes, api changes...