- made some changes to the way pointers are handled