Update comments to reflect reality, minor cleanup