a lot of updates that I should have committed awhile ago