small changes
regex for span and offset classes