enhancements and fixes to motion experiment