fix loop, comments