api overview and some fixes