Arguments parser bugs corrected