Various minor changes, removed setOptions and replaced with extend