Massive update. Major cleanup, fixes, email