WK-445 Changed some defaults and documentation