some class cleanup
switched to triangles
Block class cleanup
cleaned up clean.cpp a little