Handle saving keystores, and some comments