fix up specs & clean up whitespace