started refactor of tools + network; fixed a few loose ends