Doxygen and Coding conventions

Now merged mine and Sam’s updates so they are both done.