failed CBM: Bionic Visual Impairment
Bugfixes and cleanups.