enabled swap support and trying to add a better debug wrapper for stack trace
added some logging to remote
some patches for xml choice