Work on Infrared Scanner and removal of bugs introduced with the
previous commit.