initial commit and some minor mods