Fixed all current JS Issues