add Berkeley header; format a little better