change url and fix bug