Screentest added and Makefile fixed