Some work on fixing manipulator (#39)