Bugfixes and Readme