added support for friendly fire and not colliding with walls inappropriately