Bugfixes, added Makefile
Bugfix because I am stupid
Added guard just in case