Several Bug Fixed!