Update Readme and fix some formatting