updated a bunch of things, ready to test if it breaks things