fixed some initialization oddities
Merge branch 'admin'