Added history disabling
Toggle history on and off
More updates