some minor mods