Update readme and more comments