Reoredered some skills, re-built JS.