More cleanup, added a randomKeygen method
Additional Cleanup
woops, fix typo
Moved some more stuff
Added descriptions for everything