updated some methods and naming and added doxygen comments