WIP: README and minor bugfixes