General fiddling around with the code.