Fixed a lot of method names. Rewriting stuff you know