Fixed parser for input arguments, made parameters more modular