fixes. added optional crypt