Updated README + some bugfixes