fixing lots of things, pushing lots of things i updated forever ago OOPS