some improvements to Manipulate