Various updates. This is a terrible commit.