added a bunch of stuff (worst commit comment ever)