Minor fixes and comments addition