tweaks and cleanups for Thompson Island installation