Small fixes and add a comment