Updated libs
Improved the arg/switch handling