fixed arguement parsing issues