- Clean up some junk code that was left over. - Replace ptr<> with strong_ptr<> and weak_ptr<> to easier distinguish between weak and strong pointers. - Fix a couple of bugs.