adjusted a number of parameters to make the pieces fit together better