whitebackground an a bunch of other goodies yay yay
noah fixed the merge