Fix: Some little bugs in nx_match. All added functionalities are tested and work now.