Ye API

and a couple of minor fixes