Retirement tax questions

ok..once the custodian returns the money, will turbo tax walk me through this situation and apply necessary forms?  I read where IRS will not charge if I correct it before I file?