combat changes mk2, resurrector cleanup, most of the songs code,