Minor changes, large improvements.