fix horribly broken patching.  Better logging. move teh caret sometimes