Fix declarations; doxygen comments