backup: added chooser; bug fixes; misc cleanup;