fix typos
update makefile
make tests work