Bug fixes and strict added to circles