more API
more fixes