fixed urls etc