clean up and added help toggle