Daily updates

This is actually two days of changes that deal with cleaning up prompts and simplifying the syncing process.