update Makefile to account for .hh's and have some more nice features