updated comments
fixed merged issues