Changed how the parameter's arguments work
Small fixes towards optional arguments