Adding Makefile install, bugs fixed