bugfixes,  better readme and cleanup