Fixes, added Makefile