Updated doxygen and organzied a few comment blocks in source