Fixed repositories and updated castles