Improvements on return values and comment sections treatment...