added 404 code to protect against accessing bogus nodes
renamed "new/edit" merge functions to "add/subtract" for clarity
Merge branch 'merging_interface'