Fix bugs in Makefile
Fix display timing issue