Retirement tax questions

Clarification:  I meant "Miscellaneous Income ->" down to "Any other income" exactly as you described.  NOT 1099-MISC.  Don't want to mislead anyone.  Glad to hear a 5 April software fix is coming.  This fix is what I'm looking for.  Thanks!