Bugs found, comments added