Bug fixes in general and touch ups on the help dialogue