fix tabs
add sorting deps
sortable dependencies
more sortable things, minor formatting
formatting, more sortable cleanup