cleaner framing
a couple small misc tweaks