TSAGE: Bugfixes for R2R drive room, and work on scanner modal dialog