Clean up admin, removed some config attributes, additional admin help