more cleanup
more cleanup
surface getters for corners
moved methods to Surface class