Small fixes
Updated URLs format