Minor cleanups and add currentDoll method