Clean up docs. Add helpful error messages