working on Discovery hack, plus tweaks