some cleanup and added transitioning to circles