comments
Comments capability added, fixed conflicts