minor changes, add makefile