add a bunch of things & clean up
a