made a bunch of changes I forgot to push