cleanup, url support. bug fixes