fixed urls and some small stuff