lots of style tweaks
merge