fixed more stuff and changed url generation to lazy