Add dump of current settings and fixes