Quoted strings and cleaned a few things