minor changes
Some spec dir changes; some changes to patterns; editing directories; etc.