extensive changes to Manipulate.m, now works much better