Fixed some minor stuff with the JS.  Added some hacks, again