Added overheat indication and slightly better tolerance for overheats