Slowly but surely slaying the yellow (= need-to-be-fixed-or-added-to) out of my thesis...