wtfsayo: Focused on bugfix work and other tasks, making 2 commits that modified 3 files with a net addition of 124 lines of code.