Update readme and make tweaks to setup