minor changes

mostly small code-things.