ModelHelper cleanup fix
Settings improvements
Custom products updates