Venue fixes, more template fixes, almost ready