Fixed file and option parsing