Bug Fixes

• Fixed an issue where dependencies in node files were re-ordering unnecessarily.

• A few other small fixes.