Calling endpoints now, other fixes