Small Changes + Getting Ready For Sorting Data