API limits and improved error messages

Improved stability of one-click editing