finished first pass at tweaking to my own taste