More work on ConnectedTextures and clean up.