Can pass in arguments to skip GUI, other fixes