Bug Fix and Documentation