add Makefile
fix typo
misc fixes