added comments. Remove unused test comments
fix conflicts