javadocs typos fixed, Uri input source refactored