misc cleanup, fixed bug with calling controllers multiple times, added names to a couple anonymous callbacks for debugging purposes