style fixes
replace history
minor fixes