Modified comments to highlight a few bits of code which were only used for testing