more syntax fixes, add makefile