Multiple fixes and minor additions.