More fixes to the detailed. Everything's in it now! Still lots to do
Other commit message was for this commit. Sorry