Added selection sort + small adjustments