add Berkeley specific header, minor cleanup