fixes some little echo niggles I discovered