added -D stub, fixed non arg parsing