Changed logger's Expander to Fitter
Various improvements