Fix up all the ugly bits with the Haddock docs
Make docs take a username