Bug fix and update Docs