Some settings + api fixes