some new specs

also: minor formatting cleanup