some minor tweaks and sort of a fix for the frozen echo thing