Updating error name
Document and finalize templates