cleanup, updates, synch...