Some bugfixes in the README and Makefile