Simplify and fix, add a title option spec