Update Readme and a few tweeks