Updated readme and some comments