Some js and not only fixes