Added validation of options; made some option names shorter