Preliminary CouchDB support - and typos