My workaround for now is to turn off all imports and put in all the trades manually. I know that could seem like a lot of work, but it's really not. I used the import abilities to get started and then turned them off for the very reason you mentioned. If you modify imported transactions, there is a good chance CT won't "see" that it has already imported it and do it again, which makes a complete mess. So, until Dario comes up with a solution that puts all the imports on the same time-base, that's how I'm doing it.

As to whether you should put addresses in the comments is completely up to you. One thing I do recommend is if you are using ShapeShifter that you keep a file (I use PowerPoint) of screenshots of the transactions, because there is no way to reconstruct what happened.

Steve