Odds and end fixes; checking in before refactor of SpecStack