Fixing bugs, but broken.