mostly fixed, js bandaids are broke
more miscellaneous formatting and etc changes
fixed bandaid
foo