added comments
fixed comment container