Some comments added for fixes