Added options.parse and few fixes.