fix urls and some bugs