lots of bracket delim fixes, etc.