Fix bugs (still ongoing).