whole bunch of changes

woot