timeoverlap fixes 0.5

some fixes, not complete