Got rid of doxygen warnings and added more comments