Tweaks and fixes and updated README