Updated Makefile with additional todos