Doc/Error improvements