Metadata is giving me problems
Added more comments and generated doxygen HTML docs.
Fixed merge conflicts because of metadata