Constructors sorted out.
Uri issues fixed.
Minor refactoring and cleanup.