Minor additions to data.lisp