Updated UserMatchApp methods to be more generic, reusing code. Fixed edg...

...e cases, other general fixes. Updated the main method for some more useful testing.