more cleanup and bugfixing

regaring Scara Stuff