Lots of improvements to 'Manipulator' code; it now works