Started on v2
Got the Makefile working correctly
Fix typos