reverted some changes to enemy and player