various changes to hopefully improve the speed of the captable