Next to Master

Merging all recent changes into master. Lots of small things have changed but also fixed an issue with block finders not being stored in the DB properly.