Updated libraries; removed some command line switches