changed stuff, added Makefile