rework crt + new crt options

Change-Id: Ic008c9964b9830e7f727d0a78ff22e4faef0f33e