Node current inverted and other small fixes