- minor features and cleanup

IMHO `Missing delimiter '..' between ...` would be better.