enable surround with tag of arbitrary length
add comment, fix bug