holy crap, the last commit actually worked without a hitch. This commit fixed some tiny issues in Opt.c, and now that works too.