Super-duper Sunday improvements. And fixes.