Updates for 4.2.0

Updating for 4.2.0 and other miscellaneous cleanups.