fixing bugs
it works