modified urls, bug fixes