added sourceURL, bug fixes