some minor mods added