fixed/added comments