Fix for showCompare=false, refactor a bit

Also fix issue with not disabling tomorrow sometimes