Small fix.
Added debug flag
Cmd line option improved