Various changes, javascript added