Updated readme and some comments in code