admin fixes
modernize rewrite