More fixes and additions to readme