Got coffee, also cleaned up the echo's a bit