Enhancments to controller and model, plus data-ingestion script.