some changes

edited the match function and added standardization