Did not replaced all stored procedure calls with the call function
Added comments for two tables and touched up default values for match table