Reorder password. Bug fixes.