Fixes a couple of things, adds a few missing things, adds a few just-in-case things