Settings added

+ some clean up