More changes, JS stuff