0.2.5 bugfix, optimizations, engine