Allow single quote strings, and terminal fixes