Added more arguments and minor fixes