bugfix, improvement, and documentation