Fixes all around. Works now, though there's still an issue with the refitting.