Preview mode and other minor changes.