Updated readme; small bugfixes