Add comments and fix password dialog