Save click counters on exit.
Some cleanups in DB names