Minor updates, cosmetics and doxygen