doc layout changes, etc
merging latest erro handler crap