forgot to post a bunch of the updates, doing it right now!