fixes and comments added