Updated URL structure, bugfixes