Circle command and bug fixes