fixed root-level views, minor other changes