Fixed message saving prompt issue & minor errata in a few files