tidied and upgraded the StreamParser, implemented enums to ranking and marking
implemented enums in sorting