Update readme and some formatting