added comments
merged conflicts with messages fixed