comments added
merge fixes