More fixes and changes to the readme