Api v3 support, added settings, some minor changes