skills are now handled correctly and an enum for the skill has ben added, other minor fixes