Fixes and settingses.
Cleanup.