some improvements
some urls missing