added intertype collision, done with new stuff -- needs testing