some small changes (to be squashed with the other commit)