Improved options.c
Improved options.c