More minor tweaks, merged ShieldData into Shield, also fixed the SkillSpace being declared but not defined