Assortment of unimportant changes that I created during trying to understand how the whole resolution process works. Best read each commit separately.