modified settings + some fixes