Extra TODO and fixing version option.