now fixing bugs
initial