fix ups and overlap detection