Fixed all of the pointer stuff