fix bug with help toggle, and some cleaning up