updated comments to reflect x as done; X as won't fix;