Small fixes and comments