Remove comments; fix some atomic stores