fix some more weird bugs