Cleanup and documentation in the ced branch