changed some comments
merge changes