Some bugfixes, readme updates etc.