Minor maintenance & problem solving
* Fixes various todos
Next up is starting work on getting mod support back up.