Bugfixes and README changes