Bug Fix and updates