Adds more options
Fixing specs...