Fixes argument counting, refactors Arguments