Minor updates, adding remaining config and small refactor