Some more minor changes.
Changing framework linking.