Many fixes; new stuff.