added minor mods