Buggy error handling, update functionality