Overlap fixed. Various internal fixes