The calculations appear correct to me. I heard you don't want to rush this since they may not let you amend.
