improved makefile, additions to menu module, some minor corrections