Misc small bug fixes
Add infrared