Cleaned up a little and merge matches.js