Fixed skipping, better docs