Minor tweaks (see readme)