unmatch

found bugs related to unmatch & fixed those. note: may need to do more w/r to unmatch & location.