aesthetics improvement
fix tfs mapping
remove default settings