edit comments - NOT COMPLETE
merge changes