A LOT OF MAJOR FIXES AND FEATURES