Fix some skills, try to fix ready bug