bugfixes, functions, url-locationing, layout