minor mods...