finish help-menu and refactor a little bit