Merge fixes; bedtime.