Minor fixes in URL and code recognition, change generator function name