Tweaks
Support -g again and --modules arg