FIXED compile, formatting and pnumatics changes