fixed a little bug but still some