Bug fixing, more debug UI enhancements, calibrations, etc