cosmetics, minor api changes