added settings, still much todo