Cleaning up Echo

Cleaning up echo, moving the documentation around, etc.