Updates, fixes, cleanup, linking.