Modify display()s, filter & sort tested
Merge remote-tracking branch 'origin/master'