Added collision checks to the DMap as intended
some improvements on previous
and a comment