Changed some method prototypes, added forgotten clockwise, counter-clockwise moves