cleanup options
Fix up basic auth madness