various fixes and updated README