Bug Fix and Function Check