Added a few possibilities and fixed optionparser a bit