Bugs and comments added