more admin fixes, and crash bug fix