some minor mods and adds