get rid of stupid require option
several fixes.