fixed one bug, but still has others