cleanup
add start up menu
cleanup code and improve makefile