many more fixes to engine... more to come