Update readme and comments