fixed a bit
fixed