some small commenting throughout the patch