Implement admin settings, and fixup previous code.