encode the to into the open to prevent replay
lots of little tweaks and visual cleanups