update error handling, include simple forms