Some org and sync improvements