Minor Updates

A few little bugfixes, and some slight progress on Susan's behavior if she stays in the lab.