Small changes and fixes.

Look at the commits, as they describe what has been changed.