more cleaning + now filling the overlap works