Changed stupid struct typedefs from pointers-to-structs to simply structs, and changed references throughout code to reflect this