fixed circles
fixed bugs