More conservative opponent takeout and fixed path issue in core