Minor updates and renames.
A better fix of the return values.