Fixed few conditionals, added minified version