fix+comments