some tweaks to the options auto-adding and uniquness. closes #19