B235 Patch 2

Also incorp. some fixes for admin levels from browe