Update for helpmenu and some other bugs