Some changes I made a while back that I neglected to commit, Some fixes to some of the javascript so it actually runs.