Couple of bug fixes and comments added