Update to the readme and minor tweaks