More fixes and another new cmd /skip