corrected behaviour on skip, improved logging output