lexical cleanup; splash rework