sourceurl and fixed few more things