Crucial bugfix and documentation