various fixes, fix elliptical movement strategy
few small follow on fixes to last patch