Quite a lot of pull requests

Sorry about that!
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.