Various little tweaks -- a new error clause for surrogates and some layout changes.