Max Option count

We have now a limit os 2 options. There are some bugs. Oh well....