Manifest url fix, code cleanup