cleanup and fixed some urls