api fixes, basic functionality should work now