Minor bug fixes and fixes to the help.