circles restored
small fix
merged and minor changes