Fixing a bunch of js shiat