added doc-blocks
fixed error page