Retirement tax questions

Not sure what I did but that "excess roth contribution" has gone away! i think I had to go back and enter my income correctly for the 1099 portion. 

 

I'm still wondering if I entered my tax basis correctly... if anyone can help answer that. Is $12K correct?