Miscellaneous changes, restored some old settings