Added more runtime parameters, tweaked parser