added more arguments, changed build system