Fixed some bugs and rerun