Final fixes before 4/20 deadline.