Switch back to suggest complete API

And other logic/output improvements