Added README and some bugfixing of my bugfixing