Improve Makefile
Improve controls