add private; add switch-window; jabber, org tweaks

and a bunch of accidental indentation changes