cleaning up some code and comments that were causing errors, fixing some
broken pointers