Various updates.

Please see individual commit details.