Cleanup, extended telnet interface, etc