Corrected JS Issues