-Added combo search
-Tidied up a bit (still needs a good lookover though)