Added more skills, derived stats