still has errors in Unit.cc and Unit.h, but a lot less. Fixed some simple errors