minor changes and new sql
Merge branch 'master' of https://github.com/CaptainChaos/cryptim