uglify and fixes