Bugfix & minor doc improvements.