T-Wave in inverted + Status Message Fixes

It got too crowded in that ``if`` statement.