WIP: added error notification
Fixed recording and updating after errors