add Berkeley header, general cleanup, lint