Fixing according to wintersmith conventions

Also, adding more options