added a bunch of stuff (bad commit message)