Added new command line switches
-s startes everything except the proxy
-p only starts the proxy