Fixes

Original export was messed up and I had some tables wrong.. Starting
over from scratch..