Some updates, add makefile