Several misc. improvements.