Can someone help me check my Voluntary CPF contributions and tax relief?

Trying to understand if my maths is right:

Total CPF contributions for 2019 (Employer + employee) : 3,240
Annual CPF contribution limit: 37,740

This means that I can voluntarily contribute a total of 34,500 to CPF for tax relief, including:
CPF top up SA 7,000
Medisave top up 27,500

SRS top up cap at 15,300 is not included in the Annual CPF contribution limit.

All 3 top ups total 49,800, under the personal relief cap of 80,000

Does that look right?