Adding editting blocks and fixing issue with error messages