admin 2 fixes

Fix some bugs and incomplete features involving region-level data.