More bugfixes and updated README