Fixed repo again, and made many changes