Fixes, improvements and cleanup for HSI guage.