Toxin: display Goal on switch, and remove useless logs. Streamline display of Subject.