Fixed two little bugs
Parsing args working perfectly