minor changes
visual changes
merge from master