engine improvements
merged changes