Cleaned up queries to get back matches, cleaned up tempaltes to view stuff better