Add one more type of spec
Numerous bug fixes