a bunch of stuff i forgot to commit