cleanups and uncommented the commented out carmichael test in the fermat