Several minor updates
minor changes