revamp local node, other small fixes