Fixes
    Converted to traditional array syntax
    Added validation for --admin-* argument value
    Added several annotations