Lots of fixes for personal preferences.