MAJOR FIXES AND ADDITIONS