More progress on the node templates etc