Fixed a potential disaster with pointers pointing to pointers pointing to pointers. (it was nasty). Implemented Jacob's packet changes (merge would be messy)