Bugfixes, overlaps etc etc.