cleanup

change a few things around, cleaned it up a little, knowingly breaking some things, will probably fix later