Some more DB stuff for the writeup + some editing