Fix wrong paths + add comments