More todo items
Add .PHONY to Makefile