Improved security
Cleaned up includes
A B-Tree and a simple db won't be bad, but there's a lot of work todo
Nothing new
Merge pull request #7 from 0pq76r/dev

Merge to cov
Merge pull request #8 from 0pq76r/master

Merge into cov