try out selection of full nodes (+ small fixes)