renamed a bunch of stuff, fixed static