bug-fix, unit-tests, new pathway files