More fixes, and a new org for dot-config
Working well enough now