minor usability changes
merge