Fix a couple derps... Refactoring slightly in due to coder, and broke stuff.