Made various minor improvements.