skills reorder and minor improvements/fixes.