Looks good to me! Well done!

I still hope my calc will be handy for you one day.