Added Missing Fields & Corrected Badly Named Ones