Brought number theory out a bit
Revert "minor updates"

This reverts commit 05c2e5a589146dba496c6bd4fc71ea831fa9a88a.
merged