opt params fixes, fabrics added