1.7 updates, config checkers and refactoring