Added more detailed stats and changed encryption state names