MADS: Bugfixes and cleanup for scene 202