Minor fixes
Using 'this' in Engine.js
Fixed bug in Engine