fix, clean up, add repos: still working on it