added support for /cli and /debug switches