c2echo and some bugfixes