Some random snippet changes I made before all my data got borked