Settings continue + some changes