Fixed and comments added