Final Tweaks to who doeswhat