some minor mods
merged master