keywords and dir tree fixes from pawelsky