supply point and control point setup stuff

plus a few tweaks to related files.