Updated some 'valid node types' and added TODO here and there.