some more rearranging, make uglify/manifest fire at the same time