Fix screen-filling functions and makefile