Updates

A couple of miscellaneous updates