bug fixed & docs improved