fix modal service, fix term controllers