Bugfixes and readme