cleaned out OBE models, leftover stuff from some prior copy/paste from another OS project, minor bugs