tweaks and refactoring of Network