various small changes that I forgot to commit