minor changes; reformatting; add 'skip' argument