Added a match list adapter, cleaned up code.