added all skills, slight cleanup