Improved/corrected option reading.