Improve options once more (Still not done yet!) [ci skip]