Cleanup and small updates.