few more minor mods