small fixes, overlap calculate