Stellar Echoes: A small number of bug fixes

A small number of bug fixes