More work on specs...got some stuff to fix up