Made specs work again (and fixed a few minor items)