Tax help for military filers

You should have 1099R forms for retirement not W2.  Did you enter them as W2s so they showed up on the wrong lines?  

 

For 2017 1099R goes on lines 15 or 16.  Did you get the right taxable amount on 15b and 16b?

 

For 2018 1099R goes on line 4a and 4b.  Are they right?