Added +^[], fixed ranged and added formatting