Minor updates, adding remaining config and small refactor
Adding mate as VISUAL