typed store: final tweaks