Fix bugs and and score