fixed some errant selves and a doxygen warning