Fixed repo errors and more updates