Various changes to classes
Doxygen documentation