Some minor updates/cleanup