Completing the base data and fixing some urls