Added some missing imports and fixed the piston...

...name issue also I may have missed some imports.