final mods to initial commit