fix, cleanup, add repos