Just a few more tweaks. The DB structure should be completely final now, so have fun, I guess