Fixed some bugs with circle initializiation. Also improved the integration.