single-quote some of the things
implement a couple of pending specs