added comments (doxygen), removed some noise.