merge of chaos settings and some fixes