Cleaning up/addressing many lesser todo items of mine
More cleanup of minor todos
More minor fixes
Cleaning up the list-sorting code a bit