Added named path, and reference to return statement, fix of bad rel type ref in match clause