added settings, changed internal, etc...