more skills and bug fixes