format update
misc tweaks