More bug fixes pertaining to moving, capturing, and subsequent captures