fix names + add comments