some minor (and gratuitous ;) changes