Various little changes

You told me to contribute.