fixed circles, added lines (work in progress)