fixed names of things, baked up some views