more fixes, mainly CaptureTheToken