Some cosmetic improvements
Condition monitor now working as well.