Reorder switches
Better password entry
Small fixes