Fixing pointers, renaming some things to make more sense