Echo.Control - moving code around and some minor cleanup