Updated for latest version

Cleaned up master and updated for latest crypto version.