remove __jid__ poops
whitespace and logging tweaks