Lots of misc. changes.