Several misc. changes.