DB changes, bugfixes and new functionality