Some minor bug fixes and help information