first index stuff
added zcrypt
fixed merge conflicts