fixed more weird bugs