Switch to opt methods for non-essential fields & fixed formatting funcs