last comment corrections and clean up ephemeral values