Insignificant improvements.
Fixed bug on second Preferences window request.
Merged Preferences window fix from master.