Lots of misc. changes