added missing files, a few other changes