Cleanup, updates, and linking.