Fixed issues and Updated source url