cleaned and added some new dummy options