All bugs fixed; Tests updated and passed; Improved sorting