second pass of enhancement
updates for the day...
add some polish