Few fixes, update README and Makefile