Adding setSquare to Unit and misc syntax changes