Some updates to some things I guess