better CLI arg handling with same basic functionality as before