More skills, buffs, battle tweaks