added pub and cleaned up nodes