Updated Skills and minor fixes