Some enemy collision improvements

Still kind of buggy