Fix the previous bugs, but still have many others.