Various usability and robustness updates.