A bolus of changes to allow for naive overlaps.

Also includes fixes to tests to allow them to run faster and a number of off-by-one error checks.